Trying to prepare for a cleaner merge