2nd Commit, more complete, but IndexOutOfBoundsException currently.
Time to start hunting for the error!