Added new functions, need complete library.