skeeto-flavored overhaul. TODO delete unused things. There are many.