With some fixes.. I think