Another messed commit with wild number of changes