Adjusted some of the tables, still need more fields added in but this is basically what I want