Converting to use objects not static