leftover work I thought was pushed when I left work but seems like not.
Merge branch 'refs/heads/tempatwork' into athome
Style changes plus further work