* and / tests now pass
Add lots of comments. Some formatting. Renames.