Finished most refactoring
Started to add more elements
Finished up to element 60