inital commit, fully functional