Completed implementation of the new library - now just a matter of whether or not it works :D