Costs working for the most part. still working on year
Merge for Costs and various fixes.