Ericapi

able to merge with api stuff