First pass at adding in modules