99% crud complete