Builds now, took out an unused struct