Finished Core Functionality