Added functionality...

These files were mistakenly left out of the previous commit [d97e5eb...]