More #3 done. Adding more functions.