Latest WIP - submodules and libs added