Completed following requirements in Matt's Notes - 6,7,14 & 16