Working commit, does not compile.
Fixing merge issues.