Finally! Can't wait to see what breaks in the migration... probably nothing. Hope this actually simplifies things for once.