moving more things around
refactoring API functions
loading sugar