Merged
It mostly works...