Attempted to merge the changes in 1.6 into 1.7. Result: Not so pretty. TODO fix the rest