Final changes before live. Going to commit this to master, then checkout to new branch, then copy live code from Phaeros locally to be new master.