WIP efforts to not make this thing slow as hell