New stuff, address class (kinda) sorted out