Most core functionality.  Basic conflict resolution is in place

The code is god awfully ugly, but that's ok until a few more kinks are ironed out