Redid some imports  - Added ores to tab