1.6.1 mumbo jumbo and reorganizing some stuff again