Partial begin of a re-write.
Shorten method