Add functionality. Needs much more love though