Major work towards the next update, revamping the whole app to make it less clunky.