Validation and save working, still needs a bit of testing