Lab 5 part 2

Some work done to move things into ISR's.