first commit
updates
fully functional