Rewrite of Optimus loader, now requires properly even with Almond