Using the user message
Commented up code, simplified some functions.
Cleaned up and commited code further, ready for final testing