Fake it till it looks good.

Water, camera, 4am.
Rebase JamesDev onto Master
Merge branch 'JamesDev' into HEAD