Moving things around to make it multi platform