changed some stuff in solution. place still not complete