Work on making active class work