More object oriented stuff, fixed validator errors