Added some more reflection… too much now.