Lab bunch of refactors update?