collation display, stubs for creation
moved some stuff around
moved admin