Eighth branch

https://trello.com/c/dpIxUk9n

this is a pull request for the eighth file from the eighth branch into pre-release