Moving stff to its propper module. Lots and lots more work to do on this stuff.