- Working on #66 I couldn't get Binding to work
- Some other changes