Moved things around and tried to get stuff to work