Initial import
Fixed a couple of conflicts