Fixing typos but something is calling back early or something =/
Resolved cb mixup
Fixed up last of typos/poor scoping and tests are passing =D
Removed dev console.logs and added in more comments