starting to clean things up before writing the real module