Working on adding new functions.