Main functionality complete. Now for setuptools & clean up