refactoring complete on research
working on ipad now
updated submodules
updated build