Worked on support functions.
Merged origin into local.