Lots o' changes

Also hooked up a lot of the API’s
bunch o changes

bunches API style