Please don't nuke the existing funcitionality, better just add to it.