Uploaded most recent version so that chloe can work on updating the code
with the new architecture/algorithms developed in the meeting today.