Modernification
Major refactoring in progress
Mostly back in shape.