Adding singleton

Hey opening this up for a code review because it seems crucial.