working ID's and assignments
merge conflict resolved