Overhauled most of the code, put it on a diet too!
merger