[UPDATED] More clean up & added Production Test code utilizing the screen for commands