Smellie/basic interface into main snoplus ellie branch

Dealing with several conflicts within this branch