Updating based on implementation

Updated more as I completed the implementation