made changes in preparation for adding in final functuality