merging and getting an initial version that actually works