Final commit with COM327 project