Generic Binding is working
and some more Cleaning up