more WIP, getting close to core feature complete