Refactored code to use "type" fields rather than trackers
drwxr-xr-x - trunk
drwxr-xr-x - website