Moving things around again
Move stuff around to organize the code better