Major rewrite using simpler architecture
Update README to reflect new syntax