Clean up code and add something. Almost done