Issue #1 - Added keyword and initial functionality