Reverted to old render code

- The new still needs some work!