first commit after rebase/forking - getting api back up