dunno what done... but afraid of breaking
major rewrite oop