Moving to engine class instead of using activity