Added all the basics.
Make logging more consistent