Finished some more of the code on the laptop.
Authored by: jwjoubert 2015-06-24
Parent: [r33584]
Child: [r33586]