WiP
added submodule
almost working version