working
cleanup
add conditional fields
update readme
merge