Initial checkin
Clean up merge, add license