Changes based on product CamelCase IDs, fixed a few bugs after basic flow testing