WIP: Added some new libraries