First commit for loader work