Issue #1 solved constant issue by turning it into a class