updated, to do next is validation and more fields