Initial commit
some changes as per lessons