Final Project and adjustments to api