Committing and merging

Committing changes so I can merge into Dashboard to more easily work
with Cam.