Cleaned up a lot of the classes. Still trying to figure out our revalidate issue