Finally done

addBrand looks like arse but apart from that everything is done (except
delete which isn't much of a job)