Added Required Functionality

Almost have A