Dev

Merging more recent changes: both existing modules are now fully operational with 100% reporting functionality