working on subs architecture
that might work better
parentheses to disambiguate conditional
buxfixes
Merge pull request #1 from atcheson/dev

Dev