Needs some work see wishlist
Added validators