bug fix & intro crud basic finish