Last commit, will rewrite everything

Bad design