Continued work on deadifying the the things