Rollback & complete rewrite of most of the sourcecode