Updates, need to work on directory loading...