For #31 finished moving stuff around and all unit Tests passing