Changing format to use proper modular, still buggy.