Moved some stuff around to make it one solution