Continued work on terminal

Differentiated taxes and ranks