Moving towards non-static classes