Started reworking variable assignment