now connected stuff is in the right class