Finished with version 2 I think. All buttons and functionality added. Need now to do a bunch of testing and version 2 should be completely done and ready to be merged to master