worked on some of the remaining functions, also changed to the right renderer in our API