More feature work...

see title