Got post maint. working - still needs validation functions