Finished mainly, probably will do some touch up in morning
Merge branch 'master' of github.com:timbooker/forwardlabs