WIP: work on easier syntax
Completely rewrite