put things in the right class etc.