more import changes
its wonky, but very basic functionality works again
small style changes, removed debugging lines