Commit half finished

Get the work uploaded before TAFE