Forms work, user crud and some tidying needs doing