Refactor

moved things around. looking much better!