Added cli options and started some deeper inspection logic - broke still
removing files added by accident