Implement changes to master. Start rewriting docs.