Hopefully made time aquisition a whole lot faster using threading.
Resolved merge conflicts.