Fixed edit and update, next up is basic views