syntactic almost done
Merge branch 'feature/syntactic' into develop