Added stuff from TRON directory from eiceman