Mid way developing final terminal

Point to save on the development of the final product
Fixed Conflicts