Updated to newest libs
Major refactoring
Minor progress