working on validations, no major changes
merge conflict resolved