Features/#291

@uzadow This should finish an item off the list in #291