first commit, base functionality tested