Added screens module and fixed up engine