Commit for Wednesday 7th work

Signed-off-by: Aaron Armstrong <aaron@openplus.ca>