Removed debugging print-outs, renamed to old since starting from scratch