Refactors- huuuuge changes coming very, very soon.