Stuff from aj
Stuff from aj

Closes #674  and #674

johnathan99j/history-project,newtheatre/history-project,newtheatre/history-project,johnathan99j/history-project,newtheatre/history-project,newtheatre/history-project,newtheatre/history-project,johnathan99j/history-project,johnathan99j/history-project,johnathan99j/history-project