Just adding some more capabilities in. There are more but this is enough...

... for now