Added features per requirements, completed assignment.