changed some things to start working on multiple things. Might not be how I want to do it though, might use a builder