Moving code

I'm in the process of moving code around so this is part 1 I guess