* start on removing pseudo virtual list * rename, refactor * remove unused file * fix the tests * actually fix tests * okay actually fix tests