Messed up refactor... reverting