Work in progress for #35
Work in progress for #35