More progress
Some spacing addition