- Added lots of new functions