Fully Functionized

Added a few more functions