Huge overhaul - all to elpa, scraps helm!