Initial commit: Collector working if not pretty at the moment