Fixed assigning issue

Still incomplete though