Added TODOs to the code with my intents. Feel free to change stuff etc...