Still very incomplete, but add basic APIFetcher
Fix conflicts
Update API stuff