making more progress on stage 1
merged?