continued to make file closer to being functional