Almost ready for full integration