Updated Activity to fit Strategy Pattern, not Template
Using Strategy Pattern now