We should now be using declarative style classes
Merge "We should now be using declarative style classes"