Moving around stuff and added Hashie