cleaned up OOP class calls and working on emergency disable feature