Added functionality for the initial Fixes #2