Add in modules

Module calls added and code to dereference added.