add in brands, get ready for API changes, refactor, bug fixes, galore