Added content from old library

TODO: everything