Continue Cleanup / first version of binding and port working