Added category
Added remaining fields
Finished