Added assignments, unfinished yet