mcsorleys update

Here is my work in progress--taking shape but still needs a lot of work...