Bug 2 completed

@BG2:R, Finished bug #2 today just in time for thanksgiving.