Modified files to use samarth's class, replaced a lot of hardcoded values with variables