Generic main shell, to be implemented at a later date
Merge branch 'develop' into parser