Adding logging and fixing bugs

Squash this out later

Signed-off-by: Joe Buck <jbbuck@gmail.com>