Edit: Move around some code