added final bits, off to github with ye