added consolidated modules--need to continue to compile