Done some corrections, list and create kind of works now