major changes to api in general.