Pre release

https://trello.com/c/dpIxUk9n

Adds some stuff to master