redoing stuff and changing to fit in with the new rendering system