Not a fan of functions that only return sometimes

Removed code in progress (I'll work on that later when I have a better
idea for how to craft the interface)