Adding loader code first cut