aw I wanted to pick up from where I left off dd49 :(
Sorry about that, the changes this time were too large to properly test. I'll try to have an option for that next time.
