More work. Mostly validation related