Cleaned up libs, and added protocols.