Cleaner api
API complete. Tests remaining
Cleaned up repo