Added Kim's repo
Updated submodules