if we can fix the fold then I think we can merge in next week and give it a good test run :)