Out with the old and in with the new

Rewriting because first time was crappy