move common stuff to core
fix everything