Add scala assignments (Don't merge yet)