total refactor and libs update

its working now