Finished the base code and working on extras