Added more solutions and organized