Prepare for complete rewrite!