moving some stuff back into dropicon main