Finished V1 of assignment