Converted most methods to static.