Hey @dannyroberts. Updated the code with modifications. I think it's ready to be merged.