Adding in the rest of the application