Fleshed out logic, and updated README and all other files