engine works, I guess we can merge this to master soon