Working on mod architecture (nearly completed)