Misc status updates
Create a new, non-pattern-match version
Reorder common code so that it can be shared.
Status update