Remerged a bit, hopefully github works now