Initial commit, completed assignment