Refactor before hooking up Tanga API