Pretty much working, just need to sort out waiting and notifications
Merge branch 'master' of github.com:cazgp/comic-rocket-firefox