major internal changes plus renames coming