Added Tags to all of the code that needs to be switched when building vs running