Need to clean this mess here up