Refactored, added cruxis scan