progress, but still some bugs
more fixes, getting close to it!