[ADD] Closes #18 - May require some refactoring and security verification