majority of calls should work now, but need testing
started work on demo