Moved things around for a better structure. Need to make run now