Began to extract certain methods into a utility class. Having issues with system flags now, which will require more thought