Starting Clean

I think I totally messed up the structure, I have a new, hopefully
better idea!!