The Big Bang

A lot of refactoring