Work on Types
Work on types:
-Added more types
-Realized syntax was not optimal; started correcting it