Changed some stuff around so I can push this right now