Temporary commit pending complete rewrite