Just some minor cleanup
Big overhaul of the skeleton, things are looking greaaatatat
I suck at committing
Made "final" changes to the skeleton
Merge pull request #5 from OptimusCrime/skeleton-mockup

Skeleton mockup