Validated - well almost

Some minor formating issues but nothing critical in terms of validation.