running a little ahead of what actually exists but there's a chance to minimize breaking the api. it will probably break anyway but hey.