Pushed some initial changes to make it better, lmk what you think :)