Seems like static classes are working out well now