Initial commit
update date types
fix conflicts