Final Functionality

Added final functionality