Added validation routine and moved ViewModels