Adding more structure
More cleaning
Adding strings