Initial commit - assignement complete