Syntax changes.
Code enclosed in <> no longer have spaces between them.
Replaced the int IDs that the factory classes use with enums.