Refactored to simplify project as we wont be targetting as many platforms