Add partially working solution
Pack things up in helpers
Fix log messages