Advanced features

...work in progress