Finished version; still need to update readme.md though