Updated to using one class instead of many