second commit

2h
loading entites