Moved things around and making things not work