JIRA-1234

Feature completed. 
New classes
New methods