Finished rewrite of log parser