IN PROGRESS: http://developer.raikes-ds.com/jira/browse/PRTLP-66