Finished refactor drug into generic/brand. TODO parser