Some more progress

Getting somewhere!