Working on Screen fix/integration!