Cleanup
Add state and configurable origin
0.1.0