Added a whole lot of stuff to track progress..