Finished major rewrite
Updated README