Working commit, well... half of it.