Adding modules back in as it is apparently cool again