Pretty + Move Stuff

Prettied stuff up and moved functions to the CPP file where they
belong. Nothing works yet.