more functionality

This is just a quick push before I leave the computer - most things are
not FULLY working yet.
In the future, "more functionality" will be just "mf"