New Fields and Better Tables

Still need to work on tables