App API has changed so i'm shifting this around. this is WIP