Second draft

Signed-off-by: rand079 <rand079@aucklanduni.ac.nz>