Hopefully fixed everything and added assignments