Added most of what was requested last meeting, only thing left is to fix why logs won't be ordered by time. Revert back to smartgrid if it can be solved