Porting over source code from Nora's bitbucket repo
README needs to be updated