Adding utilities (console.log defaults, ui cruft)
Resolving merge conflict