Complete JAME rework

Updated system