Add logging funtionality
Update logging to use new logger. Fix up last bits of parsing wonkiness.
Clean up some inconsistencies