Validation

Put in various TODOs