expand added, first version of loader finished, to be tested.