Unproductive Commit
Rearranged some stuff.