WOOOOTT TWO SMALL CHANGES AWAY FROM DONE!!!!!!!!!!!!!!!!!! then code refactoring :(