More model refactoring and soon to be logfile import.