Still problems

Will be turned in in current state. Maybe return to this in the summer.