Some Improvements and Some making code work
Creating mock pht