Merge pull request #54 from vexxhost/revert-53-scalable-functionality

Revert "Scalable functionality"