Refactored off the rest of the libs