Cleaned up demo, bindings next