Move stuff into files
A passing test
Moar test
Don't over wrap