Some changes
Begun work on new translator