Added some disabled feature to see how this works.
A better approach.