Started working on converting to a PIP package