Rewrote logging, started modifying time measurement