Add solutions
Improve solutions, first try