good start on legacy, cleaned up others