Work in Progress

Addressed in 7fbc20e and disabled in 1adf38d