Live code from server

This is a pull from the live working code on the server.