as much of the refactors untill live testing