Adding bill class / made some changes to the other classes