cleaning up apis, moving work off the stack :neckbeard: