REFACTOR

I can do anything as long as it's sub v0.1!