Core works - needs cleanup