Feature arc

Subj, originally from #21 
If ok - will close #23