Module Related Posts

Updates since last merge for module