Finished changes for mogback... until the code review ;)