Trying to make some sense of this and make this thing deploy ready