checkpoint commit - moving to STS, starting on comments.
Refactored.
Refactored.
Refactored.