Bug fix
More progress
More progress
More progress but still stuck on old properties