Work in progress for #2
Merge