Logic: Adds more stuff, additional exercises are TODO.