Revert "continuing adding functionality"

This reverts commit 612215d5467f923a6938e702d96129b2b920dd07.