Refactored, started API