#126 Still much work be done
#128 #107 Move validated model into core
#128 #126
#126