Issue207 realign

I have been testing this branch for a few days now, and it's working quite well for me. Reviews and feedback welcome.