refactor singleton to not singleton plop lolz