Change 3804

Barrie Slaymaker
Request Review
- Refactored to prepare way for reducing memory footprint
4 edited 0 added 0 deleted
Tip: Use n and p to cycle through the changes.