Feature/sideloader 2.0