Changed Dollar class to be completely generic which solved a lot of issues but not all