Did many things... still not done
-still working on code merge to CI