Lab 3 working now, still needs a major code cleanup