Started on a more friendly way of doing modules