Huge code refactor. New features. Non-atomic commit. Bad developer! *wrist slap*