Order model fields (WIP)

Still a warning to fix before ordering associations and testing